From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Aug 2013 15:03:30 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b657a571a916b158914f2a1e8bd8a5f1e7fa2872;p=emacs.git

merge from trunk
---

b657a571a916b158914f2a1e8bd8a5f1e7fa2872